Tidy exception handling on IntroduceDomain, quieten down one debug message, add

another.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index f8ccc0d14ef92eb7aba3b372cc0cc6bacdb998cf..6735ccc0f2513983b85e50e5add44e90abad89a8 100644 (file)
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -336,7 +336,7 @@ def dom_get(dom):
             return domlist[0]
     except Exception, err:
         # ignore missing domain
-        log.debug("domain_getinfo(%d) failed, ignoring: %s", dom, str(err))
+        log.trace("domain_getinfo(%d) failed, ignoring: %s", dom, str(err))
     return None
 
 
@@ -569,6 +569,8 @@ class XendDomainInfo:
         self.storeDomDetails()
         self.refreshShutdown()
 
+        log.debug("XendDomainInfo.completeRestore done")
+
 
     def storeVmDetails(self):
         to_store = {
@@ -1066,8 +1068,11 @@ class XendDomainInfo:
         assert self.domid is not None
         assert self.store_mfn is not None
         assert self.store_port is not None
-        
-        IntroduceDomain(self.domid, self.store_mfn, self.store_port)
+
+        try:
+            IntroduceDomain(self.domid, self.store_mfn, self.store_port)
+        except RuntimeError, exn:
+            raise XendError(str(exn))
 
 
     def initDomain(self):